# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/03/12 16:11:02-07:00 bjorn.helgaas@hp.com 
#   Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
#   into hp.com:/home/helgaas/linux/linux-ia64-2.4
# 
# arch/ia64/kernel/ivt.S
#   2005/03/12 16:11:00-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# ChangeSet
#   2005/03/12 15:40:23-07:00 bjorn.helgaas@hp.com 
#   ia64: Update defconfigs.
# 
# arch/ia64/defconfig
#   2005/03/12 15:23:06-07:00 bjorn.helgaas@hp.com +15 -5
#   Update defconfigs.
# 
# arch/ia64/configs/zx1
#   2005/03/12 15:23:06-07:00 bjorn.helgaas@hp.com +15 -5
#   Update defconfigs.
# 
# arch/ia64/configs/ski
#   2005/03/12 15:23:06-07:00 bjorn.helgaas@hp.com +12 -5
#   Update defconfigs.
# 
# arch/ia64/configs/numa
#   2005/03/12 15:23:06-07:00 bjorn.helgaas@hp.com +15 -5
#   Update defconfigs.
# 
# arch/ia64/configs/generic
#   2005/03/12 15:23:06-07:00 bjorn.helgaas@hp.com +15 -5
#   Update defconfigs.
# 
# arch/ia64/configs/dig
#   2005/03/12 15:23:06-07:00 bjorn.helgaas@hp.com +15 -5
#   Update defconfigs.
# 
# ChangeSet
#   2005/03/12 15:38:36-07:00 yanmin.zhang@intel.com 
#   [IA64] clean up ptrace corner cases
#   
#   Patch from yanmin.zhang@intel.com to fix up some corner cases
#   in ptrace.  Many thanks to davidm for reviewing and improving.
#   
#   Backported to 2.4 by Bjorn Helgaas (bjorn.helgaas@hp.com).
# 
# arch/ia64/kernel/process.c
#   2005/03/12 15:24:43-07:00 yanmin.zhang@intel.com +1 -1
#   clean up ptrace corner cases
# 
# arch/ia64/kernel/ivt.S
#   2005/03/12 15:24:43-07:00 yanmin.zhang@intel.com +25 -22
#   clean up ptrace corner cases
# 
# arch/ia64/kernel/entry.S
#   2005/03/12 15:24:43-07:00 yanmin.zhang@intel.com +19 -7
#   clean up ptrace corner cases
# 
# ChangeSet
#   2005/03/12 15:38:27-07:00 kaos@sgi.com 
#   [IA64] Sanity check unw_unwind_to_user
#   
#   Signed-off-by: Keith Owens <kaos@sgi.com>
#   Signed-off-by: Tony Luck <tony.luck@intel.com>
# 
# arch/ia64/kernel/unwind.c
#   2005/03/12 15:26:25-07:00 kaos@sgi.com +4 -1
#   Sanity check unw_unwind_to_user
# 
# ChangeSet
#   2005/03/12 15:38:14-07:00 bjorn.helgaas@hp.com 
#   ia64: add missing syscall-slot.
# 
# arch/ia64/kernel/entry.S
#   2005/03/12 15:27:20-07:00 bjorn.helgaas@hp.com +1 -0
#   Add missing syscall-slot.
#